[vcpkg baseline][paraview:x64-osx][vcpkg_cmake_config_fixup] Revert #19469#19633
Merged
strega-nil-ms merged 4 commits intomicrosoft:masterfrom Aug 20, 2021
Merged
Conversation
PhoebeHui
added
the
category:tool-update
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
Neumann-A
reviewed
Aug 18, 2021
Neumann-A
reviewed
Aug 18, 2021
JackBoosY
approved these changes
Aug 18, 2021
Contributor
|
Ping @strega-nil-ms for merge this first. |
This was referenced Aug 19, 2021
This was referenced Aug 19, 2021
JackBoosY
added
the
info:needs-maintainer-attention
Contributor
Author
|
@dan-shaw @strega-nil, could you help merge this PR? |
This was referenced Aug 19, 2021
Merged
strega-nil-ms
force-pushed
the
dev/Phoebe/revert_19469
branch
from
0371f38 to
249fc90
Compare
There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 6b24f0fa76d171c5756f01f407682f7274cfe238 -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/v-/vcpkg-cmake-config.json b/versions/v-/vcpkg-cmake-config.json
index 5c64e79..affac6b 100644
--- a/versions/v-/vcpkg-cmake-config.json
+++ b/versions/v-/vcpkg-cmake-config.json
@@ -1,10 +1,5 @@
{
"versions": [
- {
- "git-tree": "8e51a5676507556fa8ffda0dbe78b675f8f7e58e",
- "version-date": "2021-08-18",
- "port-version": 0
- },
{
"git-tree": "b3abb12ba8ab43770aea4e5a8d4915319bd295ee",
"version-date": "2021-08-11",
Contributor
Author
|
Thank you Nicole! ☺ |
JackBoosY
suggested changes
Aug 20, 2021
Comment on lines
+6620
to
+6621
| "baseline": "2021-05-22", | ||
| "port-version": 1 |
Contributor
There was a problem hiding this comment.
@strega-nil-ms We couldn't do that because the version shoud only be added, not be reverted.
Contributor
There was a problem hiding this comment.
I think that it's fine, but would like confirmation from @ras0219-msft
Contributor
There was a problem hiding this comment.
It may look fine now, but with the next change, we will have two variants of port version 2...
Contributor
There was a problem hiding this comment.
Cut the "port version 2", it is different "version-date". It is really easy to start confusion ;-)
This was referenced Aug 20, 2021
This was referenced Aug 20, 2021
Contributor
Author
|
@strega-nil, the CI pipeline failed with following failures: |
Contributor
|
I think we can drop this PR and take #19629 instead. |
There was a problem hiding this comment.
This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!
After committing all other changes, the version database must be updated
git add -u && git commit
git checkout 996baeff2978d1e80b8939ef1688c2aa6f276dbd -- versions
./vcpkg x-add-version --allDiff
diff --git a/versions/v-/vcpkg-cmake-config.json b/versions/v-/vcpkg-cmake-config.json
index 2561cfa..affac6b 100644
--- a/versions/v-/vcpkg-cmake-config.json
+++ b/versions/v-/vcpkg-cmake-config.json
@@ -1,15 +1,15 @@
{
"versions": [
- {
- "git-tree": "330cc51bc99c6b71ed5fb51901f6f838684015a5",
- "version-date": "2021-05-22",
- "port-version": 1
- },
{
"git-tree": "b3abb12ba8ab43770aea4e5a8d4915319bd295ee",
"version-date": "2021-08-11",
"port-version": 0
},
+ {
+ "git-tree": "330cc51bc99c6b71ed5fb51901f6f838684015a5",
+ "version-date": "2021-05-22",
+ "port-version": 1
+ },
{
"git-tree": "2d4f997a32b8e8bfe98d12beb2bfe6be713c7086",
"version-date": "2021-05-22",
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Revert OSX related changes in vcpkg_cmake_config_fixup and vcpkg-cmake-config in #19469.
This PR expects to resolve the CI baseline regression 'paraview:x64-osx', since it blocks many PRs, we'd better to revert it now.
Confrimed with Jack, the changes will be re-test and fixed via PR #19629.